Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 1 Jun 2010 11:48:01 +0000 (11:48 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 1 Jun 2010 11:48:01 +0000 (11:48 +0000)
commit5855f65345808c24bc079fbe448cb366af96db39
tree463c807a24ffe8b27e02e9896d49a3c5fb79ade2
parentbf3f83cc65d942378a6a326ca45dd2ad34841cb0
parente8f7f86411edc9f0f75004edc56d4f8ce58463c7
Merge from mainline.